Adds bsd support #1
Conversation
| pub fn get_executable_path() -> Option<PathBuf> { | ||
| // FreeBSD | ||
| let mut mib = [0; 4]; | ||
| mib[0] = CTL_KERN; |
There was a problem hiding this comment.
Can't this be written as let mut mib = [ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 ];?
| let mut path = String::new(); | ||
| let len = unsafe { strlen(buf.as_ptr()) }; | ||
| let mut i = 0; | ||
| while i < len { |
There was a problem hiding this comment.
If buf is declared as a Vec instead of a raw array, you can just use buf.set_len(len) here instead. The macos module uses this approach.
| pb.push(path); | ||
| Some(pb) | ||
| } else { | ||
| // NetBSD |
There was a problem hiding this comment.
This says NetBSD but the module declaration in lib.rs says OpenBSD. Is that correct?
|
I didn't know all of that was possible. Thanks for your help Regarding OpenBSD, that was a mistake on my part. From what I can read on the internet, there seems to be no way to get the full executable path on OpenBSD, so I've removed references to it. I've also added some more information about FreeBSD, which works with |
|
Woops, forgot to use |
|
And I haven't tested this properly on NetBSD and DragonflyBSD yet. Maybe I should do that before you choose to merge, no ? I'm in the process of setting up NetBSD / Dragonfly VPS so I can test this. |
| let mut buf: Vec<u8> = Vec::with_capacity(1024); | ||
| let mut cb = 1024 as size_t; | ||
| let result = unsafe { | ||
| sysctl(mib.as_ptr(), |
There was a problem hiding this comment.
My only concern at this point, is that on NetBSD & DragonflyBSD, we're calling this sysctl that only works on FreeBSD. It seems that could have unintended consequences. I suggest we use the cfg!() macro to do platform detection. For example:
if cfg!(target_os = "freebsd") {
//Freebsd sysctl call
} else {
//fallback to readlink on /proc/curproc/{exe,file}
}
There was a problem hiding this comment.
OK, I'll do that once I have my different BSD environments running. FreeBSD will probably need an entirely different function since it uses either sysctl or a /proc file. Either way, I'll update the PR once I've pushed these modifications. Thanks for your feedback !
|
Yes, if you could test it, that would be great! I'm not really familiar with the BSDs and I'm unsure how to get a Rust environment running on one. |
|
@wesleywiser Will do ! I'm looking at using Vultr.com, which supports custom ISOs (so any OS you want, basically) and I think that rustup works fine on BSD, so installing should hopefully be easy enough. |
|
Ah ok. I forgot about rustup. I'll set up a virtual box freebsd image to
test that code path later today. The other bsds seem fairly
straightforward.
…On Sun, Jan 8, 2017, 11:20 AM Conrad Kleinespel ***@***.***> wrote:
@wesleywiser <https://github.com/wesleywiser> Will do ! I'm looking at
using Vultr.com, which supports custom ISOs (so any OS you want, basically)
and I think that rustup <https://rustup.rs/> works fine on BSD, so
installing should hopefully be easy enough.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAyu2O3O7D25biBv3BHH30oSTHVUYtEiks5rQQzRgaJpZM4Ldjgs>
.
|
|
@wesleywiser I've cleaned up the code separation for the different OSes. Unfortunately though, I wasn't able to build Rust on Dragonfly, and Dragonfly has no pre-built binaries available via Rustup. Also, I was not able to install NetBSD. I just don't get how the install process works. Given how simple the code for Dragonfly and NetBSD is, I suppose it would work. The code for FreeBSD I've tested and it works for the If you'd prefer me to remove the code for Dragonfly, NetBSD and FreeBSD (with procfs), I'm glad to do that. I just think that if someone with more Dragonfly/NetBSD/FreeBSD (with procfs) experience comes along, they'll hopefully help us fix whatever is broken. |
|
The Dragonfly & NetBSD implementations are very simple so I'm not too concerned about testing them. I'll test the FreeBSD path on my VM and then merge it. The code looks great |
|
Thanks so much! |
|
Thank you ! |
Thanks for this handy library !
This commit adds BSD support (FreeBSD, NetBSD, DragonFly, and possibly others).
Let me know if you have any questions.